Skip to content

Condense input and cleanup#21

Merged
dustin-cook merged 12 commits into
OpenPBEE:mainfrom
hgp297:condense_input
Mar 31, 2026
Merged

Condense input and cleanup#21
dustin-cook merged 12 commits into
OpenPBEE:mainfrom
hgp297:condense_input

Conversation

@hgp297

@hgp297 hgp297 commented Mar 25, 2026

Copy link
Copy Markdown
Collaborator

Summary

Small PR to address #16 and #15 before March 31 deadline. Several other cursory fixes/assertions are added:

  • typ_struct_bay_area_ft nomenclature
  • Assert that input samples have meta-tag labeling
  • Remove deprecated demo.ipynb

Closes #16, closes #15, documents #13

Changes:

  • Condensed all meta inputs into general_inputs.json and documented these in README.md
  • Removed plotModel_PBEErecovery.py as it is superseded by plotters/ functions
  • Documented unit changes in fix(input_builder): add unit conversion and replacement time scaling to Pelicun converter #20
  • Changed input parameter typ_struct_bay_area_ft to typ_struct_bay_length_ft to match description found in Matlab repository. Updated RCSW_4story_pelicun example with this nomenclature and warned user if typ_struct_bay_area_ft is used.
  • Explicitly require users to provide meta-tag labeling of columns in DMG_sample.csv and DV_repair_sample.csv, as is consistent with PBE Application. Pelicun users can manually append this by using index_label=damage_sample.columns.name when saving their damage samples to CSV.
  • Convert CMP_QNT.csv "Location" and "Direction" columns to string to facilitate parsers
  • Outdated demo notebook removed, which was based on pre-reorganized repo. Examples within are now covered in README.md

Notes

Tested that this does not conflict with #19 and #20 .

hgp297 added 4 commits March 19, 2026 11:21
- Removed input.json. Users are now asked to migrate their settings
  manually to general_inputs.json. This currently amounts to about 3-4
fields.
- input_builder.py now points to general_inputs.json only
This file contained legacy plotting usage superseded by
main_plot_functionality.py. There are no dependencies to this file.
hgp297 added 5 commits March 27, 2026 12:03
- Changed input parameter `typ_struct_bay_area_ft` to
  `typ_struct_bay_length_ft`. Original MATLAB repo documentation suggests that
this is "length of the typical structural bay, centerline to centerline"
- Changed the RCSW_4story_pelicun input to reflect this
- Supports legacy field `typ_struct_bay_area_ft` with warning
- DMG_sample.csv and DV_repair_sample.csv must contain the metatag in
  the index column. For DMG, at least 'cmp-loc-dir-ds' is required. For
DV, loc-dir-ds is required along with one of cmp, loss, or dmg.
The demo.ipynb in the root folder is deprecated (was based on
pre-restructured repo) and is removed. Examples within are now
adequately presented in main README.md, including input
explanation, sample run, and basic plotting.

@dustin-cook dustin-cook left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good

@dustin-cook
dustin-cook merged commit 9f9ffa4 into OpenPBEE:main Mar 31, 2026
18 checks passed
@hgp297
hgp297 deleted the condense_input branch March 31, 2026 18:42
zsarnoczay added a commit to zsarnoczay/PBE that referenced this pull request Apr 1, 2026
The upstream atc138 package (PR OpenPBEE/Functional-Recovery-Python#21)
consolidated input.json into general_inputs.json. Update ATC138Widget
and supporting classes to match.

- Add number_of_stories, replacement_cost_median, and plan_area_ft2 to
  the general_inputs.json output
- Add editable Replacement Cost field with bidirectional sync to the
  Pelicun Loss tab via a new singleton accessor and signal on
  PelicunLossRepairContainer
- Add read-only Plan Area display derived from side lengths
- Rename typ_struct_bay_area_ft to typ_struct_bay_length_ft (default
  changed from 169 to 30.0) with backward-compatible JSON reading
- Add LossModel to INCLUDEPATH in PBE.pro
- Update pbdl-0004 example general_inputs.json with new fields
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

2 participants